Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (12:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (12:06 -0700)
commit95010b1a48d89b2e30d074e16c653f7b12d467c3
tree1bc03cebd238f5128615354d40c2133c6b268c72
parenta102c7aa579c769125a5104b2ffa345f3c7673ef
parent9f209f8f01771f97b6de29ab39edba172dbbf225
Merge from trunk.